Move gpx_entitize to xml_entitize, call from geo.c in at least one of hte

cases that we should be calling it (sigh) to correct a problem for Rick
outputting URLs with '&' characters in them.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 5e0a025c675da9656a774bd78e748333c1884cf6..22161ed78183410b358cbae8740b870520cd4d53 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -338,6 +338,7 @@ char *strsub(char *s, char *search, char *replace);
 void rtrim(char *s);
 signed int get_tz_offset(void);
 const char *get_cache_icon(const waypoint *waypointp);
+char * xml_entitize(const char * str);
 
 /*
  * PalmOS records like fixed-point numbers, which should be rounded

diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index aa5f013c088c7c57db6eabea37c1932b79dcf55a..5a3ddaf37ed1464a0e9b1c32f92608fe4915f2e6 100644 (file)
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -252,6 +252,8 @@ geo_wr_deinit(void)
 static void
 geo_waypt_pr(const waypoint *waypointp)
 {
+       char *tmp;
+
        fprintf(ofd, "<waypoint>\n");
        fprintf(ofd, "<name id=\"%s\">", waypointp->shortname);
        fprintf(ofd, "<![CDATA[%s]]>", waypointp->description);
@@ -266,8 +268,10 @@ geo_waypt_pr(const waypoint *waypointp)
                fprintf(ofd, "<type>%s</type>\n", waypointp->icon_descr);
        }
        if (waypointp->url) {
+               tmp = xml_entitize(waypointp->url);
                fprintf(ofd, "<link text =\"Cache Details\">%s</link>\n", 
-                       waypointp->url);
+                       tmp);
+               free(tmp);
        }
        fprintf(ofd, "</waypoint>\n");
 }

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 244e60db36c7ef0c4f84f95f605d8f5c4479cdc1..89eeb5af400f3c175ae36139cb6fbb348cfd32c5 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -79,64 +79,6 @@ static route_head *rte_head;
 #define MYNAME "GPX"
 #define MY_CBUF 4096
 
-static
-char * gpx_entitize(const char * str) 
-{
-       int elen, ecount;
-       const char ** ep;
-       const char * cp;
-       char * p, * tmp, * xstr;
-       const char * stdentities[] = {
-       "&",    "&",
-       "<",    "&lt;",
-       ">",    "&gt;",
-       "'",    "&apos;",
-       "\"",   "&quot;",
-       NULL,   NULL 
-       };
-       ep = stdentities;
-       elen = ecount = 0;
-
-       /* figure # of entity replacements and additional size. */
-       while (*ep) {
-               cp = str;
-               while ((cp = strstr(cp, *ep)) != NULL) {
-                       elen += strlen(*(ep + 1)) - strlen(*ep);
-                       ecount++;
-                       cp += strlen(*ep);
-               }
-               ep += 2;
-       }
-
-       /* enough space for the whole string plus entity replacements, if any */
-       tmp = xcalloc((strlen(str) + elen + 1), 1);
-       strcpy(tmp, str);
-
-       /* no entity replacements */
-       if (ecount == 0)
-               return (tmp);
-
-       ep = stdentities;
-
-       while (*ep) {
-               p = tmp;
-               while ((p = strstr(p, *ep)) != NULL) {
-                       elen = strlen(*(ep + 1));
-
-                       xstr = xstrdup(p + strlen(*ep));
-
-                       strcpy(p, *(ep + 1));
-                       strcpy(p + elen, xstr);
-
-                       xfree(xstr);
-
-                       p += elen;
-               }  
-               ep += 2;
-       }    
-       return (tmp);
-}
-
 static void
 tag_gpx(const char **attrv)
 {
@@ -886,7 +828,7 @@ fprint_xml_chain( xml_tag *tag, const waypoint *wpt )
                        fprint_tag_and_attrs( "<", ">", tag );
                
                        if ( tag->cdata ) {
-                               tmp_ent = gpx_entitize( tag->cdata );
+                               tmp_ent = xml_entitize( tag->cdata );
                                fprintf( ofd, "%s", tmp_ent );
                                xfree(tmp_ent);
                        }
@@ -900,7 +842,7 @@ fprint_xml_chain( xml_tag *tag, const waypoint *wpt )
                        }
                        fprintf( ofd, "</%s>", tag->tagname);
                        if ( tag->parentcdata ) {
-                               tmp_ent = gpx_entitize(tag->parentcdata);
+                               tmp_ent = xml_entitize(tag->parentcdata);
                                fprintf(ofd, "%s", tmp_ent );
                                xfree(tmp_ent);
                        }
@@ -971,7 +913,7 @@ gpx_waypt_pr(const waypoint *waypointp)
                gpx_write_time(waypointp->creation_time, "time");
        }
        if (oname) {
-               tmp_ent = gpx_entitize(oname);
+               tmp_ent = xml_entitize(oname);
                fprintf(ofd, "<name>%s</name>\n", tmp_ent);
                xfree(tmp_ent);
        }
@@ -996,17 +938,17 @@ gpx_waypt_pr(const waypoint *waypointp)
                         waypointp->altitude);
        }
        if (waypointp->url) {
-               tmp_ent = gpx_entitize(waypointp->url);
+               tmp_ent = xml_entitize(waypointp->url);
                fprintf(ofd, "<url>%s%s</url>\n", urlbase ? urlbase : "", tmp_ent);
                xfree(tmp_ent);
        }
        if (waypointp->url_link_text) {
-               tmp_ent = gpx_entitize(waypointp->url_link_text);
+               tmp_ent = xml_entitize(waypointp->url_link_text);
                fprintf(ofd, "<urlname>%s</urlname>\n", tmp_ent );
                xfree(tmp_ent);
        }
        if (waypointp->icon_descr) {
-               tmp_ent = gpx_entitize(waypointp->icon_descr);
+               tmp_ent = xml_entitize(waypointp->icon_descr);
                fprintf(ofd, "<sym>%s</sym>\n", tmp_ent );
                xfree(tmp_ent);
        }
@@ -1022,12 +964,12 @@ gpx_track_hdr(const route_head *rte)
        
        fprintf(ofd, "<trk>\n");
        if (rte->rte_name) {
-               tmp_ent = gpx_entitize(rte->rte_name);
+               tmp_ent = xml_entitize(rte->rte_name);
                fprintf(ofd, "<name>%s</name>\n", tmp_ent);
                xfree(tmp_ent);
        }
        if (rte->rte_desc) {
-               tmp_ent = gpx_entitize(rte->rte_desc);
+               tmp_ent = xml_entitize(rte->rte_desc);
                fprintf(ofd, "<desc>%s</desc>\n", tmp_ent);
                xfree(tmp_ent);
        }
@@ -1073,12 +1015,12 @@ gpx_route_hdr(const route_head *rte)
        
        fprintf(ofd, "<rte>\n");
        if (rte->rte_name) {
-               tmp_ent = gpx_entitize(rte->rte_name);
+               tmp_ent = xml_entitize(rte->rte_name);
                fprintf(ofd, "<name>%s</name>\n", tmp_ent);
                xfree(tmp_ent);
        }
        if (rte->rte_desc) {
-               tmp_ent = gpx_entitize(rte->rte_desc);
+               tmp_ent = xml_entitize(rte->rte_desc);
                fprintf(ofd, "<desc>%s</desc>\n", tmp_ent);
                xfree(tmp_ent);
        }

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index c0e7684eb54627751d887a4ba7ebb44d25aac7b9..3e2e261aab4a1ff70e65f28d116822a5a607cea9 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -574,3 +574,60 @@ strsub(char *s, char *search, char *replace)
        strcat(d, p + slen);
        return d;
 }
+
+char * xml_entitize(const char * str) 
+{
+       int elen, ecount;
+       const char ** ep;
+       const char * cp;
+       char * p, * tmp, * xstr;
+       const char * stdentities[] = {
+       "&",    "&",
+       "<",    "&lt;",
+       ">",    "&gt;",
+       "'",    "&apos;",
+       "\"",   "&quot;",
+       NULL,   NULL 
+       };
+       ep = stdentities;
+       elen = ecount = 0;
+
+       /* figure # of entity replacements and additional size. */
+       while (*ep) {
+               cp = str;
+               while ((cp = strstr(cp, *ep)) != NULL) {
+                       elen += strlen(*(ep + 1)) - strlen(*ep);
+                       ecount++;
+                       cp += strlen(*ep);
+               }
+               ep += 2;
+       }
+
+       /* enough space for the whole string plus entity replacements, if any */
+       tmp = xcalloc((strlen(str) + elen + 1), 1);
+       strcpy(tmp, str);
+
+       /* no entity replacements */
+       if (ecount == 0)
+               return (tmp);
+
+       ep = stdentities;
+
+       while (*ep) {
+               p = tmp;
+               while ((p = strstr(p, *ep)) != NULL) {
+                       elen = strlen(*(ep + 1));
+
+                       xstr = xstrdup(p + strlen(*ep));
+
+                       strcpy(p, *(ep + 1));
+                       strcpy(p + elen, xstr);
+
+                       xfree(xstr);
+
+                       p += elen;
+               }  
+               ep += 2;
+       }    
+       return (tmp);
+}